Auto merge of #2299 - retep998:staticlib-naming-fiasco, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 21 Jan 2016 00:24:30 +0000 (00:24 +0000)
committerbors <bors@rust-lang.org>
Thu, 21 Jan 2016 00:24:30 +0000 (00:24 +0000)
Required for https://github.com/rust-lang/rust/pull/29520

r? @alexcrichton


Trivial merge